Merge from trunk; up to r111919.
authorBill Wohler <wohler@newt.com>
Sat, 2 Mar 2013 22:55:12 +0000 (14:55 -0800)
committerBill Wohler <wohler@newt.com>
Sat, 2 Mar 2013 22:55:12 +0000 (14:55 -0800)

Trivial merge